From 062f450709c4b365fc76d82bbed7fec6048ea134 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 18 Oct 2014 16:57:39 +0200
Subject: [PATCH] Adwaita: add back text color.

See https://bugzilla.gnome.org/show_bug.cgi?id=726316 for details.
---
 .../theme/Adwaita/_colors-public.scss         | 43 +++++----
 gtk/resources/theme/Adwaita/_colors.scss      | 31 ++++---
 gtk/resources/theme/Adwaita/_common.scss      | 20 +++--
 gtk/resources/theme/Adwaita/_drawing.scss     |  3 +-
 .../theme/Adwaita/gtk-contained-dark.css      | 32 +++++--
 gtk/resources/theme/Adwaita/gtk-contained.css | 88 +++++++++++--------
 6 files changed, 133 insertions(+), 84 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_colors-public.scss b/gtk/resources/theme/Adwaita/_colors-public.scss
index 6b65cfc401..8f88b25007 100644
--- a/gtk/resources/theme/Adwaita/_colors-public.scss
+++ b/gtk/resources/theme/Adwaita/_colors-public.scss
@@ -7,50 +7,59 @@
 // warning, it's innocuous and can be defeated by using "" + $var
 /*
 widget text/foregroung color */
-@define-color theme_fg_color #{$fg_color};
+@define-color theme_fg_color #{"" +$fg_color};
+
+/*
+text color for entries, views and content in general */
+@define-color theme_text_color #{"" +$text_color};
+
 /*
 widget base background color */
-@define-color theme_bg_color #{$bg_color};
+@define-color theme_bg_color #{"" +$bg_color};
 
 /*
 text widgets and the like base background color */
-@define-color theme_base_color #{"" + $base_color};
+@define-color theme_base_color #{"" +$base_color};
 
 /*
 base background color of selections */
-@define-color theme_selected_bg_color #{$selected_bg_color};
+@define-color theme_selected_bg_color #{"" +$selected_bg_color};
 
 /*
 text/foreground color of selections */
-@define-color theme_selected_fg_color #{"" + $selected_fg_color};
+@define-color theme_selected_fg_color #{"" +$selected_fg_color};
 
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #{$insensitive_bg_color};
+@define-color insensitive_bg_color #{"" +$insensitive_bg_color};
 
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #{$insensitive_fg_color};
+@define-color insensitive_fg_color #{"" +$insensitive_fg_color};
 
 /*
 insensitive text widgets and the like base background color */
-@define-color insensitive_base_color #{"" + $base_color};
+@define-color insensitive_base_color #{"" +$base_color};
 
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #{$backdrop_fg_color};
+@define-color theme_unfocused_fg_color #{"" +$backdrop_fg_color};
+
+/*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color #{"" +$text_color};
 
 /*
 widget base background color on backdrop windows */
-@define-color theme_unfocused_bg_color #{$backdrop_bg_color};
+@define-color theme_unfocused_bg_color #{"" +$backdrop_bg_color};
 
 /*
 text widgets and the like base background color on backdrop windows */
-@define-color theme_unfocused_base_color #{$backdrop_base_color};
+@define-color theme_unfocused_base_color #{"" +$backdrop_base_color};
 
 /*
 base background color of selections on backdrop windows */
-@define-color theme_unfocused_selected_bg_color #{$selected_bg_color};
+@define-color theme_unfocused_selected_bg_color #{"" +$selected_bg_color};
 
 /*
 text/foreground color of selections on backdrop windows */
@@ -58,17 +67,17 @@ text/foreground color of selections on backdrop windows */
 
 /*
 widgets main borders color */
-@define-color borders #{$borders_color};
+@define-color borders #{"" +$borders_color};
 
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #{$backdrop_borders_color};
+@define-color unfocused_borders #{"" +$backdrop_borders_color};
 
 /*
 these are pretty self explicative */
-@define-color warning_color #{$warning_color};
-@define-color error_color #{$error_color};
-@define-color success_color #{$success_color};
+@define-color warning_color #{"" +$warning_color};
+@define-color error_color #{"" +$error_color};
+@define-color success_color #{"" +$success_color};
 //@define-color desctructive_color #{$destructive_color}
 
 //WM
diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index cf9ab2db42..a612caedb5 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -2,26 +2,24 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: if($variant =='light', #ffffff, #292929);
-$bg_color: if($variant =='light', #ededed, #393f3f);
-$fg_color: if($variant =='light', #2e3436, #eeeeec);
+$base_color: if($variant == 'light', #ffffff, #292929);
+$text_color: if($variant == 'light', black, white);
+$bg_color: if($variant == 'light', #ededed, #393f3f);
+$fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
 $selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%));
-$selected_borders_color: if($variant=='light', darken($selected_bg_color, 30%),
-                                               darken($selected_bg_color, 20%));
-$borders_color: if($variant =='light', darken($bg_color,30%), darken($bg_color,12%));
-$borders_edge: if($variant =='light', white, transparentize($fg_color, 0.9));
-$link_color: if($variant == 'light', darken($selected_bg_color,10%),
-                                     lighten($selected_bg_color,20%));
-$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
-                                     lighten($selected_bg_color,10%));
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));
+$borders_color: if($variant == 'light', darken($bg_color,30%), darken($bg_color,12%));
+$borders_edge: if($variant == 'light', white, transparentize($fg_color, 0.9));
+$link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%));
 $top_hilight: $borders_edge;
 
 $warning_color: #f57900;
 $error_color: #cc0000;
-$success_color: if($variant =='light', #73d216, darken(#73d216,10%));
-$destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
+$success_color: if($variant == 'light', #73d216, darken(#73d216,10%));
+$destructive_color: if($variant == 'light', #ef2929, darken(#ef2929,10%));
 
 $osd_fg_color: #eeeeec;
 $osd_bg_color: #2e3436;
@@ -36,9 +34,10 @@ $insensitive_bg_color: mix($bg_color, $base_color, 60%);
 $insensitive_borders_color: $borders_color;
 
 //colors for the backdrop state, derived from the main colors.
-$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_base_color: if($variant ==' light', darken($base_color, 1%), lighten($base_color, 1%));
+$backdrop_text_color: mix($text_color, $backdrop_base_color, 80%);
 $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
-$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
+$backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
-$backdrop_dark_fill: mix($backdrop_borders_color,$backdrop_bg_color, 35%);
+$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index d952fcd720..1f6e65b78e 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -102,10 +102,10 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
 .view {
-  color: $fg_color;
+  color: $text_color;
   background-color: $base_color;
   &:backdrop {
-    color: $backdrop_fg_color;
+    color: $backdrop_text_color;
     background-color: $backdrop_base_color;
   }
   &:selected,
@@ -2552,6 +2552,7 @@ GtkScrolledWindow {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: $text_color;
   border: 1px solid $borders_color;
   &:selected {
     background-color: $selected_bg_color;
@@ -2563,24 +2564,31 @@ GtkCalendar {
   }
   &.header {
     @extend .titlebar;
+    color: $fg_color;
     box-shadow: inset 0 -1px mix($borders_color, $bg_color, 30%),
                 inset 0px 1px $top_hilight,
                 0 1px 2px transparentize(black,0.9);
     border: 1px solid $borders_color;
     border-radius: 0;
-    &:backdrop { box-shadow: none; }
+    &:backdrop {
+      color: $backdrop_fg_color;
+      box-shadow: none;
+    }
   }
   &.button {
     @extend %undecorated_button;
-    color: transparentize($fg-color,0.55);
+    color: transparentize($fg_color, 0.55);
     &:hover {
       @extend %undecorated_button;
       color: $fg_color;
     }
     &:backdrop { color: transparentize($backdrop_fg_color,0.55); }
   }
-  &.highlight { color: gtkalpha(currentColor,0.55); }
-  &:backdrop { border-color: $backdrop_borders_color; }
+  &.highlight, &.highlight:backdrop { color: gtkalpha(currentColor, 0.55); }
+  &:backdrop {
+    color: $backdrop_text_color;
+    border-color: $backdrop_borders_color;
+  }
 }
 
 /***********
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index b9795a0ffe..2285e6ce49 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -60,6 +60,7 @@
                          inset 0 2px transparentize(black, 1),
                          inset 0 1px transparentize(black, 1);
   @if $t==normal {
+    color: $text_color;
     border-color: $borders_color;
     @include _shadows($_inner_shadows,
                       entry_focus_glow(transparentize($fc,1)),
@@ -80,7 +81,7 @@
 
   }
   @if $t==backdrop {
-    color: $backdrop_fg_color;
+    color: $backdrop_text_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $backdrop_base_color);
     @include _shadows($_blank_inner_shadows, $_blank_edge);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 5c3508d6c5..d8c267c74c 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -64,10 +64,10 @@
     color: #ffffff; }
 
 .view {
-  color: #eeeeec;
+  color: white;
   background-color: #292929; }
   .view:backdrop {
-    color: #939695;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
 
 .rubberband {
@@ -170,6 +170,7 @@ GtkTextView {
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: transparent;
   background-image: linear-gradient(to bottom, #212121, #292929 90%);
+  color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
   .entry.image.left {
@@ -180,6 +181,7 @@ GtkTextView {
     padding: 2px;
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
     border: none;
@@ -199,7 +201,7 @@ GtkTextView {
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    color: #939695;
+    color: #d4d4d4;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
@@ -276,6 +278,7 @@ GtkTextView {
   .linked.vertical .entry {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
     background-image: linear-gradient(to bottom, #292929);
@@ -303,7 +306,7 @@ GtkTextView {
     .linked.vertical .entry:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #939695;
+      color: #d4d4d4;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
@@ -311,6 +314,7 @@ GtkTextView {
     .linked.vertical .entry:first-child {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      color: white;
       border-color: #1c1f1f;
       box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
       border-bottom-color: #252626; }
@@ -339,7 +343,7 @@ GtkTextView {
       .linked.vertical .entry:first-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #939695;
+        color: #d4d4d4;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #2c2c2c);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
@@ -347,6 +351,7 @@ GtkTextView {
     .linked.vertical .entry:last-child {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      color: white;
       border-color: #1c1f1f;
       box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1);
       background-image: linear-gradient(to bottom, #292929);
@@ -371,7 +376,7 @@ GtkTextView {
       .linked.vertical .entry:last-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #212121, #292929 90%);
-        color: #939695;
+        color: #d4d4d4;
         border-color: #1e2222;
         background-image: linear-gradient(to bottom, #2c2c2c);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
@@ -3470,12 +3475,13 @@ GtkProgressBar {
     border-radius: 3px;
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #212121, #292929 90%);
-      color: #939695;
+      color: #d4d4d4;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
@@ -3808,6 +3814,7 @@ GtkCalendar.header list-row.button.titlebutton {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: white;
   border: 1px solid #1c1f1f; }
   GtkCalendar:selected {
     background-color: #215d9c;
@@ -3816,10 +3823,12 @@ GtkCalendar {
     GtkCalendar:selected:backdrop {
       color: #939695; }
   GtkCalendar.header {
+    color: #eeeeec;
     box-shadow: inset 0 -1px #303535, inset 0px 1px rgba(238, 238, 236, 0.1), 0 1px 2px rgba(0, 0, 0, 0.1);
     border: 1px solid #1c1f1f;
     border-radius: 0; }
     GtkCalendar.header:backdrop {
+      color: #939695;
       box-shadow: none; }
   GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
   .titlebar GtkCalendar.button.titlebutton,
@@ -3833,9 +3842,10 @@ GtkCalendar {
     .titlebar GtkCalendar.button.titlebutton:backdrop,
     GtkCalendar.header GtkCalendar.button.titlebutton:backdrop {
       color: rgba(147, 150, 149, 0.45); }
-  GtkCalendar.highlight {
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar:backdrop {
+    color: #d4d4d4;
     border-color: #1e2222; }
 
 /***********
@@ -4367,6 +4377,9 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 widget text/foregroung color */
 @define-color theme_fg_color #eeeeec;
 /*
+text color for entries, views and content in general */
+@define-color theme_text_color white;
+/*
 widget base background color */
 @define-color theme_bg_color #393f3f;
 /*
@@ -4391,6 +4404,9 @@ insensitive text widgets and the like base background color */
 widget text/foreground color on backdrop windows */
 @define-color theme_unfocused_fg_color #939695;
 /*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color white;
+/*
 widget base background color on backdrop windows */
 @define-color theme_unfocused_bg_color #393f3f;
 /*
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index cf0957174b..343846bd29 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -64,11 +64,11 @@
     color: #ffffff; }
 
 .view {
-  color: #2e3436;
+  color: black;
   background-color: #ffffff; }
   .view:backdrop {
-    color: #8d9091;
-    background-color: #fcfcfc; }
+    color: #323232;
+    background-color: white; }
 
 .rubberband {
   border: 1px solid #4a90d9;
@@ -114,7 +114,7 @@ GtkAssistant .sidebar {
   GtkAssistant .sidebar:dir(rtl) {
     border-left: 1px solid #a1a1a1; }
   GtkAssistant .sidebar:backdrop {
-    background-color: #fcfcfc;
+    background-color: white;
     border-color: #a8a8a8; }
 GtkAssistant.csd .sidebar {
   border-top-style: none; }
@@ -126,7 +126,7 @@ GtkAssistant .sidebar .label.highlight {
 GtkTextView {
   background-color: #f6f6f6; }
   GtkTextView:backdrop {
-    background-color: #f4f4f4; }
+    background-color: #f6f6f6; }
 
 .grid-child {
   padding: 3px;
@@ -170,6 +170,7 @@ GtkTextView {
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+  color: black;
   border-color: #a1a1a1;
   box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
   .entry.image.left {
@@ -180,6 +181,7 @@ GtkTextView {
     padding: 2px;
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    color: black;
     border-color: #a1a1a1;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
     border: none;
@@ -199,9 +201,9 @@ GtkTextView {
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-    color: #8d9091;
+    color: #323232;
     border-color: #a8a8a8;
-    background-image: linear-gradient(to bottom, #fcfcfc);
+    background-image: linear-gradient(to bottom, white);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .entry:backdrop:insensitive {
     background-color: transparent;
@@ -264,10 +266,11 @@ GtkTextView {
     .entry.image:active {
       color: #4a90d9; }
     .entry.image:backdrop {
-      color: #a3a5a6; }
+      color: #a3a6a7; }
   .linked.vertical .entry {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    color: black;
     border-color: #a1a1a1;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
     background-image: linear-gradient(to bottom, #ffffff);
@@ -291,18 +294,19 @@ GtkTextView {
         border-color: #a8a8a8;
         background-image: linear-gradient(to bottom, #f4f4f4);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #e2e2e2; }
+        border-bottom-color: #e4e4e4; }
     .linked.vertical .entry:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: #8d9091;
+      color: #323232;
       border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #fcfcfc);
+      background-image: linear-gradient(to bottom, white);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-      border-bottom-color: #e2e2e2; }
+      border-bottom-color: #e4e4e4; }
     .linked.vertical .entry:first-child {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      color: black;
       border-color: #a1a1a1;
       box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
       border-bottom-color: #e2e2e2; }
@@ -318,7 +322,7 @@ GtkTextView {
         border-color: #a1a1a1;
         background-image: linear-gradient(to bottom, #f4f4f4);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #e2e2e2; }
+        border-bottom-color: #e4e4e4; }
         .linked.vertical .entry:first-child:insensitive:backdrop {
           background-color: transparent;
           background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
@@ -326,19 +330,20 @@ GtkTextView {
           border-color: #a8a8a8;
           background-image: linear-gradient(to bottom, #f4f4f4);
           box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-          border-bottom-color: #e2e2e2;
+          border-bottom-color: #e4e4e4;
           border-top-style: solid; }
       .linked.vertical .entry:first-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #8d9091;
+        color: #323232;
         border-color: #a8a8a8;
-        background-image: linear-gradient(to bottom, #fcfcfc);
+        background-image: linear-gradient(to bottom, white);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent;
-        border-bottom-color: #e2e2e2; }
+        border-bottom-color: #e4e4e4; }
     .linked.vertical .entry:last-child {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      color: black;
       border-color: #a1a1a1;
       box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white;
       background-image: linear-gradient(to bottom, #ffffff);
@@ -363,9 +368,9 @@ GtkTextView {
       .linked.vertical .entry:last-child:backdrop {
         background-color: transparent;
         background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-        color: #8d9091;
+        color: #323232;
         border-color: #a8a8a8;
-        background-image: linear-gradient(to bottom, #fcfcfc);
+        background-image: linear-gradient(to bottom, white);
         box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
 
 /***********
@@ -1385,7 +1390,7 @@ GtkCalendar.header .button.titlebutton:visited {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     .spinbutton .button:backdrop {
-      color: #989a9b;
+      color: #989b9c;
       border-color: rgba(168, 168, 168, 0.3);
       background-color: transparent; }
     .spinbutton .button:backdrop:insensitive {
@@ -1917,11 +1922,11 @@ GtkTreeView.view {
       GtkTreeView.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop {
-        color: #c6dbf1; }
+        color: #c8ddf3; }
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
-      color: #aeb0b1; }
+      color: #afb1b2; }
   GtkTreeView.view.progressbar {
     color: #ffffff;
     border-radius: 4px;
@@ -1934,9 +1939,9 @@ GtkTreeView.view {
       background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); }
       GtkTreeView.view.progressbar:selected:backdrop {
         color: #4a90d9;
-        background-color: #fcfcfc; }
+        background-color: white; }
     GtkTreeView.view.progressbar:backdrop {
-      color: #fcfcfc;
+      color: white;
       background-image: none;
       box-shadow: none; }
   GtkTreeView.view.trough {
@@ -2020,7 +2025,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
     border-style: none solid solid none;
     color: #bdbebf;
     background-image: none;
-    background-color: #fcfcfc; }
+    background-color: white; }
     column-header .button:backdrop:insensitive {
       border-color: #ededed;
       background-image: none; }
@@ -2059,7 +2064,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
         color: #c7c7c7; }
     .menu .menuitem:backdrop, .menu .menuitem:backdrop:hover {
       color: #8d9091;
-      background-color: #fcfcfc; }
+      background-color: white; }
     .menu .menuitem.arrow {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
     .menu .menuitem.arrow:dir(rtl) {
@@ -2196,7 +2201,7 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
   -GtkWidget-focus-line-width: 0;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   .notebook:backdrop {
-    background-color: #fcfcfc; }
+    background-color: white; }
   .notebook.frame {
     border: 1px solid #a1a1a1; }
     .notebook.frame.top {
@@ -3623,14 +3628,15 @@ GtkProgressBar {
     border-radius: 3px;
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    color: black;
     border-color: #a1a1a1;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
     .level-bar.trough:backdrop {
       background-color: transparent;
       background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-      color: #8d9091;
+      color: #323232;
       border-color: #a8a8a8;
-      background-image: linear-gradient(to bottom, #fcfcfc);
+      background-image: linear-gradient(to bottom, white);
       box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
   .level-bar.fill-block {
     border: 1px solid #2a76c6;
@@ -3697,7 +3703,7 @@ GtkScrolledWindow GtkViewport.frame {
   background-color: #ffffff;
   border-color: #a1a1a1; }
   .list:backdrop, .list-row:backdrop {
-    background-color: #fcfcfc;
+    background-color: white;
     border-color: #a8a8a8; }
 
 .list-row,
@@ -3840,7 +3846,7 @@ GtkCalendar.header .list-row.button.titlebutton {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #fcfcfc; }
+    color: white; }
   .list-row:selected .button:insensitive {
     color: #8d9091;
     border-color: #a1a1a1;
@@ -3969,18 +3975,21 @@ GtkCalendar.header list-row.button.titlebutton {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: black;
   border: 1px solid #a1a1a1; }
   GtkCalendar:selected {
     background-color: #4a90d9;
     color: #ffffff;
     border-radius: 3px; }
     GtkCalendar:selected:backdrop {
-      color: #fcfcfc; }
+      color: white; }
   GtkCalendar.header {
+    color: #2e3436;
     box-shadow: inset 0 -1px #d6d6d6, inset 0px 1px white, 0 1px 2px rgba(0, 0, 0, 0.1);
     border: 1px solid #a1a1a1;
     border-radius: 0; }
     GtkCalendar.header:backdrop {
+      color: #8d9091;
       box-shadow: none; }
   GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
   .titlebar GtkCalendar.button.titlebutton,
@@ -3994,9 +4003,10 @@ GtkCalendar {
     .titlebar GtkCalendar.button.titlebutton:backdrop,
     GtkCalendar.header GtkCalendar.button.titlebutton:backdrop {
       color: rgba(141, 144, 145, 0.45); }
-  GtkCalendar.highlight {
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar:backdrop {
+    color: #323232;
     border-color: #a8a8a8; }
 
 /***********
@@ -4177,7 +4187,7 @@ GtkFileChooserDialog .search-bar {
   border-color: #ededed;
   box-shadow: none; }
   GtkFileChooserDialog .search-bar:backdrop {
-    background-color: #fcfcfc;
+    background-color: white;
     border-color: #ededed; }
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #a1a1a1; }
@@ -4512,7 +4522,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
   .view:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
   .titlebar .menuitem.titlebutton.button:backdrop:selected,
   GtkCalendar.header .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected {
-    color: #fcfcfc; }
+    color: white; }
 
 /* Decouple the font of context menus from their entry/textview */
 .touch-selection,
@@ -4529,6 +4539,9 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 widget text/foregroung color */
 @define-color theme_fg_color #2e3436;
 /*
+text color for entries, views and content in general */
+@define-color theme_text_color black;
+/*
 widget base background color */
 @define-color theme_bg_color #ededed;
 /*
@@ -4553,11 +4566,14 @@ insensitive text widgets and the like base background color */
 widget text/foreground color on backdrop windows */
 @define-color theme_unfocused_fg_color #8d9091;
 /*
+text color for entries, views and content in general on backdrop windows */
+@define-color theme_unfocused_text_color black;
+/*
 widget base background color on backdrop windows */
 @define-color theme_unfocused_bg_color #ededed;
 /*
 text widgets and the like base background color on backdrop windows */
-@define-color theme_unfocused_base_color #fcfcfc;
+@define-color theme_unfocused_base_color white;
 /*
 base background color of selections on backdrop windows */
 @define-color theme_unfocused_selected_bg_color #4a90d9;
-- 
2.30.2